From 98892a5e5760cdcc2d4919b8f0030bcf9c0ca78c Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 15 Apr 2008 16:07:30 +0100
Subject: [PATCH] tools: Build fixes for *BSD. Signed-off-by: Keir Fraser
 <keir.fraser@citrix.com>

---
 tools/ioemu/osdep.c         | 2 ++
 tools/ioemu/tapdisk-ioemu.c | 1 +
 tools/libxc/xg_private.c    | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/ioemu/osdep.c b/tools/ioemu/osdep.c
index 774959b65f..e3a870154a 100644
--- a/tools/ioemu/osdep.c
+++ b/tools/ioemu/osdep.c
@@ -21,6 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
+#include "config-host.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/tools/ioemu/tapdisk-ioemu.c b/tools/ioemu/tapdisk-ioemu.c
index a28fabe585..272b277abb 100644
--- a/tools/ioemu/tapdisk-ioemu.c
+++ b/tools/ioemu/tapdisk-ioemu.c
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <signal.h>
+#include <sys/time.h>
 
 #include <assert.h>
 
diff --git a/tools/libxc/xg_private.c b/tools/libxc/xg_private.c
index 02c0ff70a6..224544a744 100644
--- a/tools/libxc/xg_private.c
+++ b/tools/libxc/xg_private.c
@@ -8,7 +8,6 @@
 #include <unistd.h>
 #include <zlib.h>
 #include <strings.h>
-#include <stdlib.h>
 #include <malloc.h>
 
 #include "xg_private.h"
@@ -209,7 +208,7 @@ void *xg_memalign(size_t alignment, size_t size)
     if (ret != 0)
         return NULL;
     return ptr;
-#elif defined(_BSD)
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
     return valloc(size);
 #else
     return memalign(alignment, size);
-- 
2.30.2